Updated and added new asserts