Make some specs pass
fix specs