Refactored: proper support for multiple test methods
Fixed a flaky test: cannot rely on JUnit's order of test methods