small fixes and test integration