General commit
Added result controller test (bugs commented out)
General commit