Removed timer code
More tests