Update existing tests

addresses #354