make fixes
More tests