Added further definitions and Tests. Fixed some invalid definitions.