Add testing procedures, some test data