some basic tests works again after refactor