Add additional checks to remove test