Restructured / initialized testing