Enabled subcollections and added tests. Closes #1