Small fix & add (working) tests