Fix and update tests, introduce new directory layout