Built out test directories for each app, added more tests