Better structure, moved test