Edited responses, added tests.