Added more tests and changed PollAPI.scala a bit