Fixed unit tests and removed jquery abstraction for now