Unit tests ready (have to be cleaned up still)