Merge pull request #99 from mattyb149/bad-35

BAD-35: fixed package errors in test code
BAD-35: Fixed tests to use new invoked method