Final Commit with tests