Just added a few generic tests as well as added necessary files to compile for testing