Update tests and marhsall typo