removed test and added own.