removing some tests for now, they have to be re-addressed anyway