simplified tests and faster