Temporary commit
Fix class methods for declare test data
Fix associations