using instrumentTest as src folder for gradle build
updated to gradle 0.4 plugin
updated test to be based on count rather than 0 or 1
updated tests and merged gradle build