#30 restructuring tests and examples