Split up tests remove comments