[Tests/Misc] Refactored tests to be more unified; prepared new tests; small fix in comment.