Non-sprint task - switch to usage of @NonNull and @Nullable annotations within API.
Non-sprint task - reduced interface definition + made JUnit test null-safe.