Added test classes and fixed bug in time presentation