updated spec_helper properly, some other cleanup