Adjust tests to compensate for descriptions
Load tests from individual files