[#SDS-198] Create sceleton, fix tests