Organise tests a bit better and added a few failing tests for future api