Cleaned up BlockDevice code
Improved BlockDevice tests