Fixed bug with test implementation and added start / stop clock