Almost finished all test cases. Will finish the two not working before class