Cleaned up old URLBuilder #11
Fixed failing test #11