Add some more testing material
Rearrange the output and prepare for database entry