Removed fixtures and added a constants file