All (uncommented) tests passing