Updating tests
Updated implementation of *block functions and fixed tests