[dev] Added tests + fixed build