Added mock tests, eggs and small reformat