Fixed failing unit tests (or removed/fixed invalid ones)