Refactored test to have all test cases in own dir