@emir-hasanbegovic fixed tests and started mavenizing the different pieces