Created a proper test hierarchy