[Tests] Extended/refactored tests.