#3 - some more api tests and fixing in existing.