Test cases now pass