added tests and test fixtures