Converted project to Gradle project.
fixed tests and other goof-ups I just caused with previous commits