Adding tests for Samantha and Liem