us57: Added more tests