Finished test writing and did minor tasks