remove test and added some tweaks