Fixed wrong variable naming.
Cleaned up tests.
Fixed test migrations for laravel 5.
Merge branch 'master' into laravel-5