cleaned up tests so that all written tests now pass