Updated structure / clarify testing options