Refactored tests and changed localhost links