Limited test suite and minor fixes

:)