MOD Tests and Bugfixes