few bug fixes (not really) in comparison and moved it from tests to controllers for deployement