Fixing timer marshalling problems (TimerManager)
(cherry picked from commit d9c88f5f809244b27674cd4eadc57d17f9d37fa3)
Removing marshalling test framework and fixing tests