added more tests
added some other stuff to controller