updated complete goal method, added more tests