More tests to fix NullPointerException