added unit tests and fixtures