Added placeholder tests and fixed a couple bugs