mostly fixes and take tests out
mostly fixes and take tests out