moved user tests to correct files