Fix most specs and improve the testing environment

Space missing after comma.