Fixed some of the api unit tests. 11/15 Wworking!