User tests

Initial work for for #6