Adding some initial testing code (lots more todo).