Tests Restructured / Utils added