Make it work

Tests need some serious