modified tests to be less controller like