Removed some useless time-consuming tests