#489 - Friendlier tests
#506 - Version improvements