Some tests added (not completed yet though)