added timer/gtests and fixed basic methods. history still needs attention