Fixes MessageTimer and missing models
-Also a test for Jenkins! :)