Refactorization of tests. Added test tags.