Arranged Errors in Maps
Amended Tests