Added more tests. Cleaned up test fixture