Added Tests

/cc @sshillo @will2357