Updated testing
Updated != and == to is not and is (for None types)