WIP: fixed few failed tests