Added 9 out of 14 tests