Fixed tests and constants
Updated content