fixing up stests..