updated tests, added todo reminder
NPE protection, report c3151f4eccfb0a66ac1f14f31b74723b