Split up functions and add more tests