fixed some tests, commented out others, will reinstate soon
add missing test case