added tests, improved droidium impl