Working on registration + tests