move to correct test unit folder
add user selection with tests