Additional unit tests and @since documentation