More tests

tests are still being refactored but a controller change is necessary in production