Fix for issue #876
Synced with latest changes in hotfix
@rnicholus' test stuff is now matching the right paths
Checks now appear in line.
Moved old tests.