updated test config and organized some tests