working build with refactored tests