SimpleSystemTest green
fixed some unittests