Test: square test
Added oscillator test
Resolving conflict