Some test classes added