This is little stricter than necessary but good for tests
* test.h provides some macros to aid test writing * applied that to some tests