Added Core Test and removed Stub one
Added some code (without Core itself)