clean-up / convert to dispatchers / added lots of Skipped tests
version 0.05