Updated repo with tests