refactored Unittests (one assert per test)