removes hardcoded urls
removes unnecessary model methods
more tests