updating answer controller and fixing tests