Added test, added new check