switched expected and actual in tests
reused test data setup
tests cleanup for "one assert per test" - marking duplicated asserts