JSON-API fixes, more elabarate test fixtures, closes #18