moar tests, work on sane composition