Initial commit. Fixed initial failing test