Add tests and strip out console message