Patched xpr file for tests
Initial setup and first tests