move tests and remove broken test code