fixed timer class
started integration tests