More tests and intial feature set completion.