Avoid NPE in common base endpoint
Adding a few more tests