Restructuring, started tests