added tests and fixtures