Fixed unit test & removed in-house config