Complete refactoring of tests!

A bit late but let's say it's my gift for new year =D