fixing stuff for testers