fixed tester and it works mostly
fixed stuff in tseter and merged changes