Added tests, now passing 9/14 P3b tests