Please merge changes. Two small fixes in the src, rest are fixes for unit test

Nota bene: Travis-CI reports wrongly green, as I forgot to return 1 when exiting test/suite.rb