why are we adding TEST_USER and removing os_user ?

i see what is happening here... but is a bit confusing.

not sure what to suggest.