Added: wrap with object, wrap test in function