Bugfixing and improvements. BasicTest with significant test values.