EAGLESIX-2691 Renamed the test files I have enhanced to _test