Feature/fix issue 55 setup test support