Clean up tests and examples
Fix issue with Numbers in arrays