enhanced tests and added fade