more rigorous testing
remove dependency