Made the occupation and nhinumber tests green
Merge branch 'tests' into icons