Edited some classes again and trying simple tests