only now tests are right, (hopefully) last commit soon!