Clean unit tests and fix error in kernel/block