Add some more api unit tests