clean up some non-functioning tests and sort out datatypes