End of testing. All tests are passing. - fix #552