rewrite for future Susy impl + add atoum tests