Updated testing code

Implemented actual timing code and fixed templates