Added tests for 44a561b and updated existing tests.