Turned unit test class into proper unittest module