Adding standalone tests