Fixed bugs and updated testing commands