modified taketest and testanswer functions in test controller, student can now take the test
removed merged changes