Added some tests x2 + cleanup