Removed empty test and renamed classes