Additional clean up + new tests

Tests for timing