More test improvements. Hopefully travis will pass sometime soon