Reorganize tests and add two test consts