fixed some issues with non-working tests and prepared for maven deployment
fixed some issues with non-working tests and prepared for maven deployment