Updated settlement method test to completion
Removed old files