* added a few more tests, renamed singular to plural to match controller * increase error reporting * removed debugging and wait for tests