Begin restructing tests #30