i lied, added a few more tests

merged make functions into one