Improved tests. Added Timer class. Misc Updates