initial commit
fix tests