added test and fixtures