tests, code style, proper support for rc