Fixed all failing tests, some further implementation of features.