Moved Sites and CoordinateConverter into app object

Also refactored test to extract a custom expect function.