Some test case work, some fixing of the project. A few data types still need to be added in order for jUnit tests compile and run.