WIP-3 - improvements & moar tests