Update classpath, unit tests

Fix some issues with Eclipse. It's only a matter of time before
switching to Android Studio.