adding classes to test controller
merging conflicts