Tests added.. better late than never