Test cases now working