Reduced sizes even further, added tests