First version with test-suite working