Revert "Revert "Restored working tests""

This reverts commit 0ed611fe43732b7c9e6c918d2c22ca7ee2e73d95.

Conflicts:
	pom.xml