fixed test back
Merge branch 'master' of github.com:rvalta/ohtu-viikko1-2014

Merge because tests are broken atm.