Cleaned up a few tests. More to cleanup