created controller tests
removed old useless Splash controller
one user model test
merge conflicts