Unit test and fixtures added