Add a simple test app and make better tests