Added more test cases and started converting utility libs to not be instances.