Updated test framework and added tests

Default Android Studio setting. I'll get rid of it.