Small bug correction and initial test