Finished some tests for the demonstration