More tests, more complete profile