WIP-3, fixed tests