Adding more tests
make work with new api