fixed some naming issues and started on unit testing