Cleaned up tests and made NOTES coherent