Refactored a lot of tests and code with people holder module and expect-change syntax