Brought up to date with changes in marijnh/master.

Preprocessor tests were removed from tests.js for now, more comprehensive tests will be added later.