Fixed some problems with the overlap method and added tests to catch those conditions.