removed warning, refactored test