Basic testing appended. Some errors were fixed