Added 2 presenting tests, minor updates