Add shapes directory to automatic tests