added more test's, fleshing out functionality