Better constant handling and module loadingRearranged tests to own directory