added acceptance/unit tests for ghawk88