Issue #8

Change ouput format to OO
Remove tests not needed.