Fixed eq, added some tests