Update project version tests to assertj

Also add feature annotations
Clean up and streamline some tests