Move test data around
Minor cleanup and moving of test data
Bump et_users 1.4.1
Version bump 1.17.1