added couple more tests fix api based on test