[#14] Added the rest of the tests