Better Ioc tests and code cleanup