Issue 508

I fixed the checks which are made during the unit tests and I fixed the failed properties. This should solve Issue #508.