More tests to Amplifier and a few other issues