Updated how HK2 is being used and started adding some tests.