updated test and cleaned up warnings