forgot to comment out some tests :)