@phleet Tests have been added... PTAL?