Clean unit tests and fix error in kernel/block
Merge pull request #133 from alain91/master

Clean unit tests and fix error in kernel/block