add states
Merge branch 'sandra'
add tests
Merge branch 'master' of github.com:petternorman/valtechUH_api