Cleaned up test files, helpers and moved 'requires' to each helper.