Some little convenience features, more tests