Misc cleanup, getting specs passing again on travis