Add some more Framework functions for testing with clients