Updated tests for new features of API.
(Tested against guiness)