Merge more test improvements and tests

Conflicts:
	tests/suites/test_suite_cipher.blowfish.data