Feature/build fixes and basic test