Test time
Better coverage; Remove util methods