added some user tests. removed some old ones.