More tests, and updated build rules