Fixed all of the test scripts to properly import from model and controller. Also a few minor bugs