WIP bugfix
WIP more blocks tests