Implement OnConstructor. Fix the test, the implementation is still broken.