Added tests and stuff - one test in store_controller_test still fails.