Improving test coverage of core classes
Moved messages around a bit.