TODO update - READ!
fix building of tests