Did some refactoring on the testing code