added more tests for 545
patched more tests for 545