deleted everything and stared from scratch, added matrix class and testplan