fixed compilation issues
tests now pass