Removed timer as they are unnecessary in VS2013
Added new tests