Added separate include files, some unit testing stuff