Added 8 test cases, 7 left to implement