Removing non-functional tests