improved tests & mapped a couple more functions