Reorganized e2e test files, small progress on admin tests
Commented out tests that don't work, need to commit to sync with laptop