Added abstract api classes
Modified Expedia; added tests