Fixing grammar; isolating time calcuation for tests