Splitted old sugar tests into separate files