fixing up test cases, not done yet :(
no views yet either :(