Cleaned up code, individual tests pull in individual functions now, cleaned up package.json scripts