Update tests - Fix #37