Add (minor) tests