Bugfixes and start on simplet test framework.