Restructured and added sky service test