OZP-646: Organizing functional test code
OZP-646: Simple functional test now passes