Fixed specs to pass test with the new features