BOLD separated files with new tests
BOLD separated files with new tests