fixing tests. cleaning up