Initial commit
Fixed failing tests