Updated tests to new implementation