Improvde things based on justin his feedback. Includes a test for media urls now. See #72