Add Tests, Move Test src folder to appropriate loc