Fix NaiveSpinLock -> ReentrantLock + fix Observable tests