Got rid of the test statements