Migrated to new mockster 2.0