Fixed tests, start implementing todolist