Baserunning tests and logic added