Q and other tests
merge with the source