wrote more tests
Merge branch 'master' into testing
fixed landing page spec
typed some tests
wrote more tests
fixed conflicts