Add missing file to solution and rename test