Added more tests, cleaned up stdout messages.