Moved test fixtures and added some tests.