NCBC-674: missing test files and renaming

Change-Id: I637dc07b33209d45f06dfdafbdc51b68d9525e03
Reviewed-on: http://review.couchbase.org/41949
Tested-by: Jeffry Morris <jeffrymorris@gmail.com>
Reviewed-by: Andrei Baranouski <andrei.baranouski@gmail.com>