More work on user tests, have a few todo's