Added data fixtures and aligned unittests