Remove left-over function
Add test using nullptr for C++11