Add makred tests and fix marked definitions