Fix most specs and improve the testing environment