Fixed bug - forgot to return false on errors
Updated tests / test infrastructure