Beefed up acceptable inputs and added unit tests with Mete