majority of test cases now implemented