Some datautils tests and more stuff for the demo