New tests - not all passing