More tests + kinda working