Added acceptance/unit tests and outputs