WIP beef up the test case
WIP Refactor