Fixed specs and removed most deprecation issues