Updated tests with new expected output. Also took new function into use and removed the old one. Since the comment removal isn't added yet, one of the tests is expected to fail and it is temporarily disabled.
Moved the test into the core where it belongs.
